Actually ignore system/user registries during locking (2nd attempt)#13082
Merged
Mic92 merged 2 commits intoNixOS:masterfrom Apr 25, 2025
Merged
Actually ignore system/user registries during locking (2nd attempt)#13082Mic92 merged 2 commits intoNixOS:masterfrom
Mic92 merged 2 commits intoNixOS:masterfrom
Conversation
This reverts commit 3b5f0d9.
github-actions
bot
added
with-tests
edolstra
force-pushed
the
fix-ignore-local-registries
branch
from
b977dcb to
68de26d
Compare
edolstra
added
the
backport 2.28-maintenance
13 tasks
Contributor
|
Should we also add tests to verify user registry not ignored with other operations (to prevent something like #13050)? |
13 tasks
Mic92
reviewed
Apr 25, 2025
| # Ensure that locking ignores the user registry. | ||
| mkdir -p "$TEST_HOME/.config/nix" | ||
| ln -sfn "$registry" "$TEST_HOME/.config/nix/registry.json" | ||
| nix flake metadata --flake-registry '' flake1 |
Member
There was a problem hiding this comment.
@edolstra it looks like the test was not able to capture the previous regression. Do you know why this is the case?
Member
There was a problem hiding this comment.
Ah, We actually tried to use a flake from the registry. So this usecase is not tested in this pull request.
Member
Yeah. At least in nixpkgs we have now a patch merged and backported, so we can take this pull request a bit slower. |
Member
|
Looks like the test is only testing "global" registry entries: |
Member
edolstra
added a commit
that referenced
this pull request
Apr 25, 2025
…3082 Actually ignore system/user registries during locking (2nd attempt) (backport #13082)
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
Makes #12068 actually work. All registries are used for resolving top-level flakerefs, but only the global and flag registries are used for resolving flake inputs.
Fixes #13050.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.